integrating PR #340 into latest docker-client#691
integrating PR #340 into latest docker-client#691grexe wants to merge 8 commits intospotify:masterfrom
Conversation
…lementations to be used
This required: - adding a few annotations - adding resteasy dependencies - adding hackery to make streaming work with RESTEasy - switching to Parameterized JUnit tests - documentation for how to use it
…L/ProgressStream, fixed merge errors, added needed factory method for HTTP client.
|
Glad someone picks up this issue again! But it seems you did some formatting changes too... With 7k +/- line changes its almost impossible to see what has changed and it will be a pain to review. It cases the new merge conflicts too. Can you revert the formatting changes? (As I remember too that the original PR only had about 700 line changes and was pretty easy to read) |
|
sorry for that @jwgmeligmeyling - seems my IntelliJ formatter was a bit over aggressive (using standard 4 spaces indentation etc. though). |
|
PS: didn't test with the JerseyClientProvider yet btw for regressions, but didn't change anything there. |
|
Ah yes, I will review it with ignore-whitespace for now. Going to test against Wildfly 10.1.0.Final as well. |
|
I don't know exactly but I vaguely remember that the formatting here was 2 spaces in Google Code style (for imports too). Can't find that back in the |
|
found a missing dependency in my PR, will fix and update the PR. |
|
+1 |
4 participants
this PR builds on PR #340 and brings it up to date with latest additions, e.g. had to extend the ClientFactory to provide the HTTP client based on REST impl, fixed dependency issues for projects including the lib.
Only the Swarm tests fail. Works in Wildfly 10 with Docker 1.12.6 on Ubuntu 16.10 x64.
Please review for integration.